Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c64c701 authored by Brian Gerst's avatar Brian Gerst Committed by H. Peter Anvin
Browse files

x86-32: Move XQUAD definitions to numaq.h 



The XQUAD stuff is part of the NUMAQ architecture, so move it there.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
LKML-Reference: <1265380629-3212-2-git-send-email-brgerst@gmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 56dca4ce

arch/x86/include/asm/io_32.h

+0 −3
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ 
  *  - Arnaldo Carvalho de Melo <acme@conectiva.com.br>

  */



#define XQUAD_PORTIO_BASE 0xfe400000

#define XQUAD_PORTIO_QUAD 0x40000  /* 256k per quad. */



#ifdef __KERNEL__



#include <asm-generic/iomap.h>

arch/x86/include/asm/numaq.h

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ extern int get_memcfg_numaq(void); 


extern void *xquad_portio;



#define XQUAD_PORTIO_BASE 0xfe400000

#define XQUAD_PORTIO_QUAD 0x40000  /* 256k per quad. */

#define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)



/*

 * SYS_CFG_DATA_PRIV_ADDR, struct eachquadmem, and struct sys_cfg_data are the

 */

arch/x86/pci/numaq_32.c

+1 −5
Original line number Diff line number Diff line
@@ -8,9 +8,7 @@ 
#include <asm/apic.h>

#include <asm/mpspec.h>

#include <asm/pci_x86.h>



#define XQUAD_PORTIO_BASE 0xfe400000

#define XQUAD_PORTIO_QUAD 0x40000  /* 256k per quad. */

#include <asm/numaq.h>



#define BUS2QUAD(global) (mp_bus_id_to_node[global])
@@ -18,8 +16,6 @@ 


#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])



#define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)



#define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \

	(0x80000000 | (BUS2LOCAL(bus) << 16) | (devfn << 8) | (reg & ~3))